Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Sep 2011 21:20:09 +0000 (14:20 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Sep 2011 21:20:09 +0000 (14:20 -0700)
commite85ea2b74c84ff387248b70a7831fc4da92a2a8c
tree0a30b71a780973c85b75353dbbc1ab472a1d9b2e
parent0a08f69e8b350a879f3a796c477878e4e7101a29
parente867230e516f6c6f704519ada14b506c7dc78e70
Merge from trunk.